Further macro protection by replacing _[A-Z] with _[A-Z]p git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@145410 91177308-0d34-0410-b5e6-96231b3b80d8 
diff --git a/include/__bit_reference b/include/__bit_reference index 9ee1dd9..2688b5e 100644 --- a/include/__bit_reference +++ b/include/__bit_reference 
@@ -22,8 +22,8 @@    _LIBCPP_BEGIN_NAMESPACE_STD   -template <class _C, bool _IsConst> class __bit_iterator; -template <class _C> class __bit_const_reference; +template <class _Cp, bool _IsConst> class __bit_iterator; +template <class _Cp> class __bit_const_reference;    template <class _Tp>  struct __has_storage_type @@ -31,22 +31,22 @@  static const bool value = false;  };   -template <class _C, bool = __has_storage_type<_C>::value> +template <class _Cp, bool = __has_storage_type<_Cp>::value>  class __bit_reference  { - typedef typename _C::__storage_type __storage_type; - typedef typename _C::__storage_pointer __storage_pointer; + typedef typename _Cp::__storage_type __storage_type; + typedef typename _Cp::__storage_pointer __storage_pointer;    __storage_pointer __seg_;  __storage_type __mask_;    #if defined(__clang__) - friend typename _C::__self; + friend typename _Cp::__self;  #else - friend class _C::__self; + friend class _Cp::__self;  #endif - friend class __bit_const_reference<_C>; - friend class __bit_iterator<_C, false>; + friend class __bit_const_reference<_Cp>; + friend class __bit_iterator<_Cp, false>;  public:  _LIBCPP_INLINE_VISIBILITY operator bool() const _NOEXCEPT  {return static_cast<bool>(*__seg_ & __mask_);} @@ -68,74 +68,74 @@  {return operator=(static_cast<bool>(__x));}    _LIBCPP_INLINE_VISIBILITY void flip() _NOEXCEPT {*__seg_ ^= __mask_;} - _LIBCPP_INLINE_VISIBILITY __bit_iterator<_C, false> operator&() const _NOEXCEPT - {return __bit_iterator<_C, false>(__seg_, static_cast<unsigned>(__ctz(__mask_)));} + _LIBCPP_INLINE_VISIBILITY __bit_iterator<_Cp, false> operator&() const _NOEXCEPT + {return __bit_iterator<_Cp, false>(__seg_, static_cast<unsigned>(__ctz(__mask_)));}  private:  _LIBCPP_INLINE_VISIBILITY  __bit_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT  : __seg_(__s), __mask_(__m) {}  };   -template <class _C> -class __bit_reference<_C, false> +template <class _Cp> +class __bit_reference<_Cp, false>  {  };   -template <class _C, class _D> +template <class _Cp, class _Dp>  _LIBCPP_INLINE_VISIBILITY inline  void -swap(__bit_reference<_C> __x, __bit_reference<_D> __y) _NOEXCEPT +swap(__bit_reference<_Cp> __x, __bit_reference<_Dp> __y) _NOEXCEPT  {  bool __t = __x;  __x = __y;  __y = __t;  }   -template <class _C> +template <class _Cp>  _LIBCPP_INLINE_VISIBILITY inline  void -swap(__bit_reference<_C> __x, bool& __y) _NOEXCEPT +swap(__bit_reference<_Cp> __x, bool& __y) _NOEXCEPT  {  bool __t = __x;  __x = __y;  __y = __t;  }   -template <class _C> +template <class _Cp>  _LIBCPP_INLINE_VISIBILITY inline  void -swap(bool& __x, __bit_reference<_C> __y) _NOEXCEPT +swap(bool& __x, __bit_reference<_Cp> __y) _NOEXCEPT  {  bool __t = __x;  __x = __y;  __y = __t;  }   -template <class _C> +template <class _Cp>  class __bit_const_reference  { - typedef typename _C::__storage_type __storage_type; - typedef typename _C::__const_storage_pointer __storage_pointer; + typedef typename _Cp::__storage_type __storage_type; + typedef typename _Cp::__const_storage_pointer __storage_pointer;    __storage_pointer __seg_;  __storage_type __mask_;    #if defined(__clang__) - friend typename _C::__self; + friend typename _Cp::__self;  #else - friend class _C::__self; + friend class _Cp::__self;  #endif - friend class __bit_iterator<_C, true>; + friend class __bit_iterator<_Cp, true>;  public:  _LIBCPP_INLINE_VISIBILITY - __bit_const_reference(const __bit_reference<_C>& __x) _NOEXCEPT + __bit_const_reference(const __bit_reference<_Cp>& __x) _NOEXCEPT  : __seg_(__x.__seg_), __mask_(__x.__mask_) {}    _LIBCPP_INLINE_VISIBILITY operator bool() const _NOEXCEPT  {return static_cast<bool>(*__seg_ & __mask_);}   - _LIBCPP_INLINE_VISIBILITY __bit_iterator<_C, true> operator&() const _NOEXCEPT - {return __bit_iterator<_C, true>(__seg_, static_cast<unsigned>(__ctz(__mask_)));} + _LIBCPP_INLINE_VISIBILITY __bit_iterator<_Cp, true> operator&() const _NOEXCEPT + {return __bit_iterator<_Cp, true>(__seg_, static_cast<unsigned>(__ctz(__mask_)));}  private:  _LIBCPP_INLINE_VISIBILITY  __bit_const_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT @@ -146,11 +146,11 @@    // find   -template <class _C> -__bit_iterator<_C, false> -__find_bool_true(__bit_iterator<_C, false> __first, typename _C::size_type __n) +template <class _Cp> +__bit_iterator<_Cp, false> +__find_bool_true(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)  { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It;  typedef typename _It::__storage_type __storage_type;  static const unsigned __bits_per_word = _It::__bits_per_word;  // do first partial word @@ -180,11 +180,11 @@  return _It(__first.__seg_, static_cast<unsigned>(__n));  }   -template <class _C> -__bit_iterator<_C, false> -__find_bool_false(__bit_iterator<_C, false> __first, typename _C::size_type __n) +template <class _Cp> +__bit_iterator<_Cp, false> +__find_bool_false(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)  { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It;  typedef typename _It::__storage_type __storage_type;  static const unsigned __bits_per_word = _It::__bits_per_word;  // do first partial word @@ -217,23 +217,23 @@  return _It(__first.__seg_, static_cast<unsigned>(__n));  }   -template <class _C, class _Tp> +template <class _Cp, class _Tp>  inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C, false> -find(__bit_iterator<_C, false> __first, __bit_iterator<_C, false> __last, const _Tp& __value_) +__bit_iterator<_Cp, false> +find(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, const _Tp& __value_)  {  if (static_cast<bool>(__value_)) - return __find_bool_true(__first, static_cast<typename _C::size_type>(__last - __first)); - return __find_bool_false(__first, static_cast<typename _C::size_type>(__last - __first)); + return __find_bool_true(__first, static_cast<typename _Cp::size_type>(__last - __first)); + return __find_bool_false(__first, static_cast<typename _Cp::size_type>(__last - __first));  }    // count   -template <class _C> -typename __bit_iterator<_C, false>::difference_type -__count_bool_true(__bit_iterator<_C, false> __first, typename _C::size_type __n) +template <class _Cp> +typename __bit_iterator<_Cp, false>::difference_type +__count_bool_true(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)  { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It;  typedef typename _It::__storage_type __storage_type;  typedef typename _It::difference_type difference_type;  static const unsigned __bits_per_word = _It::__bits_per_word; @@ -260,11 +260,11 @@  return __r;  }   -template <class _C> -typename __bit_iterator<_C, false>::difference_type -__count_bool_false(__bit_iterator<_C, false> __first, typename _C::size_type __n) +template <class _Cp> +typename __bit_iterator<_Cp, false>::difference_type +__count_bool_false(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)  { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It;  typedef typename _It::__storage_type __storage_type;  typedef typename _It::difference_type difference_type;  static const unsigned __bits_per_word = _It::__bits_per_word; @@ -291,23 +291,23 @@  return __r;  }   -template <class _C, class _Tp> +template <class _Cp, class _Tp>  inline _LIBCPP_INLINE_VISIBILITY -typename __bit_iterator<_C, false>::difference_type -count(__bit_iterator<_C, false> __first, __bit_iterator<_C, false> __last, const _Tp& __value_) +typename __bit_iterator<_Cp, false>::difference_type +count(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, const _Tp& __value_)  {  if (static_cast<bool>(__value_)) - return __count_bool_true(__first, static_cast<typename _C::size_type>(__last - __first)); - return __count_bool_false(__first, static_cast<typename _C::size_type>(__last - __first)); + return __count_bool_true(__first, static_cast<typename _Cp::size_type>(__last - __first)); + return __count_bool_false(__first, static_cast<typename _Cp::size_type>(__last - __first));  }    // fill_n   -template <class _C> +template <class _Cp>  void -__fill_n_false(__bit_iterator<_C, false> __first, typename _C::size_type __n) +__fill_n_false(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)  { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It;  typedef typename _It::__storage_type __storage_type;  static const unsigned __bits_per_word = _It::__bits_per_word;  // do first partial word @@ -333,11 +333,11 @@  }  }   -template <class _C> +template <class _Cp>  void -__fill_n_true(__bit_iterator<_C, false> __first, typename _C::size_type __n) +__fill_n_true(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)  { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It;  typedef typename _It::__storage_type __storage_type;  static const unsigned __bits_per_word = _It::__bits_per_word;  // do first partial word @@ -363,10 +363,10 @@  }  }   -template <class _C> +template <class _Cp>  _LIBCPP_INLINE_VISIBILITY inline  void -fill_n(__bit_iterator<_C, false> __first, typename _C::size_type __n, bool __value_) +fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n, bool __value_)  {  if (__n > 0)  { @@ -379,22 +379,22 @@    // fill   -template <class _C> +template <class _Cp>  inline _LIBCPP_INLINE_VISIBILITY  void -fill(__bit_iterator<_C, false> __first, __bit_iterator<_C, false> __last, bool __value_) +fill(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, bool __value_)  { - _VSTD::fill_n(__first, static_cast<typename _C::size_type>(__last - __first), __value_); + _VSTD::fill_n(__first, static_cast<typename _Cp::size_type>(__last - __first), __value_);  }    // copy   -template <class _C, bool _IsConst> -__bit_iterator<_C, false> -__copy_aligned(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, - __bit_iterator<_C, false> __result) +template <class _Cp, bool _IsConst> +__bit_iterator<_Cp, false> +__copy_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, + __bit_iterator<_Cp, false> __result)  { - typedef __bit_iterator<_C, _IsConst> _In; + typedef __bit_iterator<_Cp, _IsConst> _In;  typedef typename _In::difference_type difference_type;  typedef typename _In::__storage_type __storage_type;  static const unsigned __bits_per_word = _In::__bits_per_word; @@ -436,12 +436,12 @@  return __result;  }   -template <class _C, bool _IsConst> -__bit_iterator<_C, false> -__copy_unaligned(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, - __bit_iterator<_C, false> __result) +template <class _Cp, bool _IsConst> +__bit_iterator<_Cp, false> +__copy_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, + __bit_iterator<_Cp, false> __result)  { - typedef __bit_iterator<_C, _IsConst> _In; + typedef __bit_iterator<_Cp, _IsConst> _In;  typedef typename _In::difference_type difference_type;  typedef typename _In::__storage_type __storage_type;  static const unsigned __bits_per_word = _In::__bits_per_word; @@ -514,10 +514,10 @@  return __result;  }   -template <class _C, bool _IsConst> +template <class _Cp, bool _IsConst>  inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C, false> -copy(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, __bit_iterator<_C, false> __result) +__bit_iterator<_Cp, false> +copy(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)  {  if (__first.__ctz_ == __result.__ctz_)  return __copy_aligned(__first, __last, __result); @@ -526,12 +526,12 @@    // copy_backward   -template <class _C, bool _IsConst> -__bit_iterator<_C, false> -__copy_backward_aligned(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, - __bit_iterator<_C, false> __result) +template <class _Cp, bool _IsConst> +__bit_iterator<_Cp, false> +__copy_backward_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, + __bit_iterator<_Cp, false> __result)  { - typedef __bit_iterator<_C, _IsConst> _In; + typedef __bit_iterator<_Cp, _IsConst> _In;  typedef typename _In::difference_type difference_type;  typedef typename _In::__storage_type __storage_type;  static const unsigned __bits_per_word = _In::__bits_per_word; @@ -573,12 +573,12 @@  return __result;  }   -template <class _C, bool _IsConst> -__bit_iterator<_C, false> -__copy_backward_unaligned(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, - __bit_iterator<_C, false> __result) +template <class _Cp, bool _IsConst> +__bit_iterator<_Cp, false> +__copy_backward_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, + __bit_iterator<_Cp, false> __result)  { - typedef __bit_iterator<_C, _IsConst> _In; + typedef __bit_iterator<_Cp, _IsConst> _In;  typedef typename _In::difference_type difference_type;  typedef typename _In::__storage_type __storage_type;  static const unsigned __bits_per_word = _In::__bits_per_word; @@ -659,10 +659,10 @@  return __result;  }   -template <class _C, bool _IsConst> +template <class _Cp, bool _IsConst>  inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C, false> -copy_backward(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, __bit_iterator<_C, false> __result) +__bit_iterator<_Cp, false> +copy_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)  {  if (__last.__ctz_ == __result.__ctz_)  return __copy_backward_aligned(__first, __last, __result); @@ -671,20 +671,20 @@    // move   -template <class _C, bool _IsConst> +template <class _Cp, bool _IsConst>  inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C, false> -move(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, __bit_iterator<_C, false> __result) +__bit_iterator<_Cp, false> +move(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)  {  return _VSTD::copy(__first, __last, __result);  }    // move_backward   -template <class _C, bool _IsConst> +template <class _Cp, bool _IsConst>  inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C, false> -move_backward(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, __bit_iterator<_C, false> __result) +__bit_iterator<_Cp, false> +move_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)  {  return _VSTD::copy(__first, __last, __result);  } @@ -854,31 +854,31 @@    // rotate   -template <class _C> +template <class _Cp>  struct __bit_array  { - typedef typename _C::difference_type difference_type; - typedef typename _C::__storage_type __storage_type; - typedef typename _C::iterator iterator; - static const unsigned __bits_per_word = _C::__bits_per_word; - static const unsigned _N = 4; + typedef typename _Cp::difference_type difference_type; + typedef typename _Cp::__storage_type __storage_type; + typedef typename _Cp::iterator iterator; + static const unsigned __bits_per_word = _Cp::__bits_per_word; + static const unsigned _Np = 4;    difference_type __size_; - __storage_type __word_[_N]; + __storage_type __word_[_Np];    _LIBCPP_INLINE_VISIBILITY static difference_type capacity() - {return static_cast<difference_type>(_N * __bits_per_word);} + {return static_cast<difference_type>(_Np * __bits_per_word);}  _LIBCPP_INLINE_VISIBILITY explicit __bit_array(difference_type __s) : __size_(__s) {}  _LIBCPP_INLINE_VISIBILITY iterator begin() {return iterator(__word_, 0);}  _LIBCPP_INLINE_VISIBILITY iterator end() {return iterator(__word_ + __size_ / __bits_per_word,  static_cast<unsigned>(__size_ % __bits_per_word));}  };   -template <class _C> -__bit_iterator<_C, false> -rotate(__bit_iterator<_C, false> __first, __bit_iterator<_C, false> __middle, __bit_iterator<_C, false> __last) +template <class _Cp> +__bit_iterator<_Cp, false> +rotate(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __middle, __bit_iterator<_Cp, false> __last)  { - typedef __bit_iterator<_C, false> _I1; + typedef __bit_iterator<_Cp, false> _I1;  typedef typename _I1::difference_type difference_type;  typedef typename _I1::__storage_type __storage_type;  static const unsigned __bits_per_word = _I1::__bits_per_word; @@ -889,16 +889,16 @@  {  if (__d1 <= __d2)  { - if (__d1 <= __bit_array<_C>::capacity()) + if (__d1 <= __bit_array<_Cp>::capacity())  { - __bit_array<_C> __b(__d1); + __bit_array<_Cp> __b(__d1);  _VSTD::copy(__first, __middle, __b.begin());  _VSTD::copy(__b.begin(), __b.end(), _VSTD::copy(__middle, __last, __first));  break;  }  else  { - __bit_iterator<_C, false> __mp = _VSTD::swap_ranges(__first, __middle, __middle); + __bit_iterator<_Cp, false> __mp = _VSTD::swap_ranges(__first, __middle, __middle);  __first = __middle;  __middle = __mp;  __d2 -= __d1; @@ -906,16 +906,16 @@  }  else  { - if (__d2 <= __bit_array<_C>::capacity()) + if (__d2 <= __bit_array<_Cp>::capacity())  { - __bit_array<_C> __b(__d2); + __bit_array<_Cp> __b(__d2);  _VSTD::copy(__middle, __last, __b.begin());  _VSTD::copy_backward(__b.begin(), __b.end(), _VSTD::copy_backward(__first, __middle, __last));  break;  }  else  { - __bit_iterator<_C, false> __mp = __first + __d2; + __bit_iterator<_Cp, false> __mp = __first + __d2;  _VSTD::swap_ranges(__first, __mp, __middle);  __first = __mp;  __d1 -= __d2; @@ -927,12 +927,12 @@    // equal   -template <class _C> +template <class _Cp>  bool -__equal_unaligned(__bit_iterator<_C, true> __first1, __bit_iterator<_C, true> __last1, - __bit_iterator<_C, true> __first2) +__equal_unaligned(__bit_iterator<_Cp, true> __first1, __bit_iterator<_Cp, true> __last1, + __bit_iterator<_Cp, true> __first2)  { - typedef __bit_iterator<_C, true> _It; + typedef __bit_iterator<_Cp, true> _It;  typedef typename _It::difference_type difference_type;  typedef typename _It::__storage_type __storage_type;  static const unsigned __bits_per_word = _It::__bits_per_word; @@ -1005,12 +1005,12 @@  return true;  }   -template <class _C> +template <class _Cp>  bool -__equal_aligned(__bit_iterator<_C, true> __first1, __bit_iterator<_C, true> __last1, - __bit_iterator<_C, true> __first2) +__equal_aligned(__bit_iterator<_Cp, true> __first1, __bit_iterator<_Cp, true> __last1, + __bit_iterator<_Cp, true> __first2)  { - typedef __bit_iterator<_C, true> _It; + typedef __bit_iterator<_Cp, true> _It;  typedef typename _It::difference_type difference_type;  typedef typename _It::__storage_type __storage_type;  static const unsigned __bits_per_word = _It::__bits_per_word; @@ -1048,31 +1048,31 @@  return true;  }   -template <class _C, bool _IC1, bool _IC2> +template <class _Cp, bool _IC1, bool _IC2>  inline _LIBCPP_INLINE_VISIBILITY  bool -equal(__bit_iterator<_C, _IC1> __first1, __bit_iterator<_C, _IC1> __last1, __bit_iterator<_C, _IC2> __first2) +equal(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1, __bit_iterator<_Cp, _IC2> __first2)  {  if (__first1.__ctz_ == __first2.__ctz_)  return __equal_aligned(__first1, __last1, __first2);  return __equal_unaligned(__first1, __last1, __first2);  }   -template <class _C, bool _IsConst> +template <class _Cp, bool _IsConst>  class __bit_iterator  {  public: - typedef typename _C::difference_type difference_type; + typedef typename _Cp::difference_type difference_type;  typedef bool value_type;  typedef __bit_iterator pointer; - typedef typename conditional<_IsConst, __bit_const_reference<_C>, __bit_reference<_C> >::type reference; + typedef typename conditional<_IsConst, __bit_const_reference<_Cp>, __bit_reference<_Cp> >::type reference;  typedef random_access_iterator_tag iterator_category;    private: - typedef typename _C::__storage_type __storage_type; - typedef typename conditional<_IsConst, typename _C::__const_storage_pointer, - typename _C::__storage_pointer>::type __storage_pointer; - static const unsigned __bits_per_word = _C::__bits_per_word; + typedef typename _Cp::__storage_type __storage_type; + typedef typename conditional<_IsConst, typename _Cp::__const_storage_pointer, + typename _Cp::__storage_pointer>::type __storage_pointer; + static const unsigned __bits_per_word = _Cp::__bits_per_word;    __storage_pointer __seg_;  unsigned __ctz_; @@ -1081,7 +1081,7 @@  _LIBCPP_INLINE_VISIBILITY __bit_iterator() _NOEXCEPT {}    _LIBCPP_INLINE_VISIBILITY - __bit_iterator(const __bit_iterator<_C, false>& __it) _NOEXCEPT + __bit_iterator(const __bit_iterator<_Cp, false>& __it) _NOEXCEPT  : __seg_(__it.__seg_), __ctz_(__it.__ctz_) {}    _LIBCPP_INLINE_VISIBILITY reference operator*() const _NOEXCEPT @@ -1189,34 +1189,34 @@  : __seg_(__s), __ctz_(__ctz) {}    #if defined(__clang__) - friend typename _C::__self; + friend typename _Cp::__self;  #else - friend class _C::__self; + friend class _Cp::__self;  #endif - friend class __bit_reference<_C>; - friend class __bit_const_reference<_C>; - friend class __bit_iterator<_C, true>; - template <class _D> friend struct __bit_array; - template <class _D> friend void __fill_n_false(__bit_iterator<_D, false> __first, typename _D::size_type __n); - template <class _D> friend void __fill_n_true(__bit_iterator<_D, false> __first, typename _D::size_type __n); - template <class _D, bool _IC> friend __bit_iterator<_D, false> __copy_aligned(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); - template <class _D, bool _IC> friend __bit_iterator<_D, false> __copy_unaligned(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); - template <class _D, bool _IC> friend __bit_iterator<_D, false> copy(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); - template <class _D, bool _IC> friend __bit_iterator<_D, false> __copy_backward_aligned(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); - template <class _D, bool _IC> friend __bit_iterator<_D, false> __copy_backward_unaligned(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); - template <class _D, bool _IC> friend __bit_iterator<_D, false> copy_backward(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); + friend class __bit_reference<_Cp>; + friend class __bit_const_reference<_Cp>; + friend class __bit_iterator<_Cp, true>; + template <class _Dp> friend struct __bit_array; + template <class _Dp> friend void __fill_n_false(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n); + template <class _Dp> friend void __fill_n_true(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n); + template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_aligned(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); + template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_unaligned(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); + template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> copy(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); + template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_backward_aligned(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); + template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_backward_unaligned(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); + template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> copy_backward(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result);  template <class __C1, class __C2>friend __bit_iterator<__C2, false> __swap_ranges_aligned(__bit_iterator<__C1, false>,  __bit_iterator<__C1, false>,  __bit_iterator<__C2, false>); @@ -1226,22 +1226,22 @@  template <class __C1, class __C2>friend __bit_iterator<__C2, false> swap_ranges(__bit_iterator<__C1, false>,  __bit_iterator<__C1, false>,  __bit_iterator<__C2, false>); - template <class _D> friend __bit_iterator<_D, false> rotate(__bit_iterator<_D, false>, - __bit_iterator<_D, false>, - __bit_iterator<_D, false>); - template <class _D> friend bool __equal_aligned(__bit_iterator<_D, true>, - __bit_iterator<_D, true>, - __bit_iterator<_D, true>); - template <class _D> friend bool __equal_unaligned(__bit_iterator<_D, true>, - __bit_iterator<_D, true>, - __bit_iterator<_D, true>); - template <class _D, bool _IC1, bool _IC2> friend bool equal(__bit_iterator<_D, _IC1>, - __bit_iterator<_D, _IC1>, - __bit_iterator<_D, _IC2>); - template <class _D> friend __bit_iterator<_D, false> __find_bool_true(__bit_iterator<_D, false>, - typename _D::size_type); - template <class _D> friend __bit_iterator<_D, false> __find_bool_false(__bit_iterator<_D, false>, - typename _D::size_type); + template <class _Dp> friend __bit_iterator<_Dp, false> rotate(__bit_iterator<_Dp, false>, + __bit_iterator<_Dp, false>, + __bit_iterator<_Dp, false>); + template <class _Dp> friend bool __equal_aligned(__bit_iterator<_Dp, true>, + __bit_iterator<_Dp, true>, + __bit_iterator<_Dp, true>); + template <class _Dp> friend bool __equal_unaligned(__bit_iterator<_Dp, true>, + __bit_iterator<_Dp, true>, + __bit_iterator<_Dp, true>); + template <class _Dp, bool _IC1, bool _IC2> friend bool equal(__bit_iterator<_Dp, _IC1>, + __bit_iterator<_Dp, _IC1>, + __bit_iterator<_Dp, _IC2>); + template <class _Dp> friend __bit_iterator<_Dp, false> __find_bool_true(__bit_iterator<_Dp, false>, + typename _Dp::size_type); + template <class _Dp> friend __bit_iterator<_Dp, false> __find_bool_false(__bit_iterator<_Dp, false>, + typename _Dp::size_type);  };    _LIBCPP_END_NAMESPACE_STD